Fix setting modules build type for tsh and tctl#51986
Merged
Conversation
vapopov
commented
Feb 8, 2025
vapopov
added
the
no-changelog
Collaborator
|
There is no such thing as enterprise builds for tsh, tctl, and Teleport Connect. We distribute single build that works for all types of clusters. It took over a year of thoughtful changes to make this happen. Please maintain this property. |
Member
|
@zmb3 Vadym is trying to prevent AGPL builds of tsh/tctl from auto-updating to community or enterprise edition builds hosted on the CDN. I think we have a few options to solve this:
Do you have a preference for which approach is taken? I agree this shouldn't involve introducing additional builds of the binaries. |
Collaborator
|
1 or 3 sound okay to me. I would avoid option 2. |
sclevine
reviewed
Feb 10, 2025
Contributor
Author
…uested by the `webapi/find` response or set via an environment variable.
sclevine
reviewed
Feb 10, 2025
Contributor
Author
|
Verified on https://github.com/gravitational/teleport.e/actions/runs/13252616358 build, for community and enterprise packages |
zmb3
approved these changes
Feb 11, 2025
sclevine
approved these changes
Feb 11, 2025
Member
|
Thanks @vapopov, looks good! |
public-teleport-github-review-bot
Bot
removed request for
codingllama,
gzdunek,
hugoShaka and
r0mant
vapopov
added a commit
that referenced
this pull request
Feb 11, 2025
* Fix setting modules for tsh and tctl * Restore IsOSSBuild() * Add different warning messages depending on whether the update is requested by the `webapi/find` response or set via an environment variable. * Check only the build type of client tools
vapopov
added a commit
that referenced
this pull request
Feb 11, 2025
* Fix setting modules for tsh and tctl * Restore IsOSSBuild() * Add different warning messages depending on whether the update is requested by the `webapi/find` response or set via an environment variable. * Check only the build type of client tools
vapopov
added a commit
that referenced
this pull request
Feb 11, 2025
* Fix setting modules for tsh and tctl * Restore IsOSSBuild() * Add different warning messages depending on whether the update is requested by the `webapi/find` response or set via an environment variable. * Check only the build type of client tools
github-merge-queue Bot
pushed a commit
that referenced
this pull request
Feb 11, 2025
* Default BaseURL only for community / enterprise editions (#51732) * Add requirement to set base URL for OSS builds Fix progress bar for darwin platform * Show warning only before update * Move error to teleportPackageURLs * Move error to teleportPackageURLs * Fix linter * Fix setting modules build type for tsh and tctl (#51986) * Fix setting modules for tsh and tctl * Restore IsOSSBuild() * Add different warning messages depending on whether the update is requested by the `webapi/find` response or set via an environment variable. * Check only the build type of client tools
github-merge-queue Bot
pushed a commit
that referenced
this pull request
Feb 11, 2025
* Add requirement to set base URL for OSS builds Fix progress bar for darwin platform * Show warning only before update * Move error to teleportPackageURLs * Move error to teleportPackageURLs * Fix linter * Fix setting modules build type for tsh and tctl (#51986) * Fix setting modules for tsh and tctl * Restore IsOSSBuild() * Add different warning messages depending on whether the update is requested by the `webapi/find` response or set via an environment variable. * Check only the build type of client tools
probakowski
pushed a commit
that referenced
this pull request
Feb 12, 2025
* Default BaseURL only for community / enterprise editions (#51732) * Add requirement to set base URL for OSS builds Fix progress bar for darwin platform * Show warning only before update * Move error to teleportPackageURLs * Move error to teleportPackageURLs * Fix linter * Fix setting modules build type for tsh and tctl (#51986) * Fix setting modules for tsh and tctl * Restore IsOSSBuild() * Add different warning messages depending on whether the update is requested by the `webapi/find` response or set via an environment variable. * Check only the build type of client tools
carloscastrojumo
pushed a commit
to carloscastrojumo/teleport
that referenced
this pull request
Feb 19, 2025
* Fix setting modules for tsh and tctl * Restore IsOSSBuild() * Add different warning messages depending on whether the update is requested by the `webapi/find` response or set via an environment variable. * Check only the build type of client tools
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I've postponed merging backports of #51732 until verify
nightlybuild since I didn't findBuildTypemodification in scripts for the client toolstshandtctl. I've verified on the latest builds:For client tools,
modules.GetModules().BuildType()always returns "oss", causing a warning to always be displayed for community and enterprise builds and disabling updates until the base URL environment variable is set.Related:
Tag build: https://github.com/gravitational/teleport.e/actions/runs/13212233201